From fd33063f9c624918b034856d3f6d89a0bb7a85ec Mon Sep 17 00:00:00 2001 From: "kaf24@viper.(none)" Date: Sun, 3 Apr 2005 11:20:01 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.205 (424fd161S0p6f85LcRWpZCuo7kqBBg) Fix tools build. Signed-off-by: Keir Fraser --- tools/Rules.mk | 3 +++ tools/ioemu/iodev/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 68a5282701..e6171ad399 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -23,3 +23,6 @@ endif %.o: %.c $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +%.o: %.cc + $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< diff --git a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile index 20a7410961..20803c0dc7 100644 --- a/tools/ioemu/iodev/Makefile +++ b/tools/ioemu/iodev/Makefile @@ -10,7 +10,7 @@ LDLIBS= $(BXLIBS) $(X11_LDPATH) -lX11 -lXpm -lstdc++ -L../../../tools/libxc -L.. all: device-model device-model: $(OBJS) $(BXLIBS) - $(LINK.o) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LDLIBS) -o $@ include $(TOPDIR)/mk/helix.mk -- 2.30.2